From 0f3a8a21224a4ac7f6f0fd76ebbae7555e5a4424 Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Wed, 29 Sep 2021 09:46:00 -0600 Subject: [PATCH] more qstringview work for qt6. (#726) --- navicache.cc | 2 +- pocketfms_fp.cc | 2 +- xol.cc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/navicache.cc b/navicache.cc index c6d1746f4..6ffb0f368 100644 --- a/navicache.cc +++ b/navicache.cc @@ -183,7 +183,7 @@ nav_read() while (!reader.atEnd()) { if (reader.tokenType() == QXmlStreamReader::StartElement) { - if (reader.name() == "CacheDetails") { + if (reader.name() == u"CacheDetails") { NaviReadCache(reader); } } diff --git a/pocketfms_fp.cc b/pocketfms_fp.cc index 9b925a1a2..fbf6d0fa1 100644 --- a/pocketfms_fp.cc +++ b/pocketfms_fp.cc @@ -165,7 +165,7 @@ void wpt_altitude(xg_string, const QXmlStreamAttributes* attrv) wpt_to->altitude = attrv->value("Value").toString().toDouble(); } if (attrv->hasAttribute("Unit")) { - isFeet = (attrv->value("Unit") == "ft"); + isFeet = (attrv->value("Unit") == u"ft"); } if (isFeet) { wpt_to->altitude = FEET_TO_METERS(wpt_to->altitude); diff --git a/xol.cc b/xol.cc index e03a43e65..6b2569f18 100644 --- a/xol.cc +++ b/xol.cc @@ -56,7 +56,7 @@ static xg_tag_mapping xol_map[] = { static void xol_overlay(xg_string, const QXmlStreamAttributes* attrv) { if (attrv->hasAttribute("version")) { - if (attrv->value("version") != "1.0") { + if (attrv->value("version") != u"1.0") { fatal(MYNAME ": Unsupported version %s.\n", qPrintable(attrv->value("version").toString())); } @@ -65,9 +65,9 @@ static void xol_overlay(xg_string, const QXmlStreamAttributes* attrv) { static void xol_shape(xg_string, const QXmlStreamAttributes* attrv) { if (attrv->hasAttribute("type")) { - if (attrv->value("type") == "waypoint") { + if (attrv->value("type") == u"waypoint") { wpt_ = new Waypoint; - } else if (attrv->value("type") == "polyline") { + } else if (attrv->value("type") == u"polyline") { trk_ = new route_head; track_add_head(trk_); } -- 2.30.2